From cb8031fde3c706cd651200d9208abfb16f16d1a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Wed, 24 May 2017 16:21:45 +0200 Subject: [PATCH] inspector: Allow picking children of GtkWidget classes --- gtk/inspector/inspect-button.c | 36 +++++++++++++++------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c index 1b97dc5eb9..7109d83d1e 100644 --- a/gtk/inspector/inspect-button.c +++ b/gtk/inspector/inspect-button.c @@ -110,29 +110,25 @@ find_widget (GtkWidget *widget, (data->x < new_allocation.x + new_allocation.width) && (data->y < new_allocation.y + new_allocation.height)) { + FindWidgetData new_data = *data; /* First, check if the drag is in a valid drop site in * one of our children */ - if (GTK_IS_CONTAINER (widget)) - { - FindWidgetData new_data = *data; - - new_data.x -= x_offset; - new_data.y -= y_offset; - new_data.found = FALSE; - new_data.first = FALSE; - - for (child = gtk_widget_get_first_child (widget); - child != NULL; - child = gtk_widget_get_next_sibling (child)) - { - find_widget (child, &new_data); - } - - data->found = new_data.found; - if (data->found) - data->res_widget = new_data.res_widget; - } + new_data.x -= x_offset; + new_data.y -= y_offset; + new_data.found = FALSE; + new_data.first = FALSE; + + for (child = gtk_widget_get_first_child (widget); + child != NULL; + child = gtk_widget_get_next_sibling (child)) + { + find_widget (child, &new_data); + } + + data->found = new_data.found; + if (data->found) + data->res_widget = new_data.res_widget; /* If not, and this widget is registered as a drop site, check to * emit "drag_motion" to check if we are actually in -- 2.30.2